resolve: Split `Scope::Module` into two scopes for non-glob and glob bindings #149681

petrochenkov · 2025-12-05T15:08:06Z

This is a re-implementation of #144131 with all the issues mentioned there fixed.

As it turned out, the non-trivial part of the split was already done in c91b6ca, so the remaining part implemented in this PR is mostly mechanical.

After addressing the issue of already found bindings being lost due to indeterminacies in outer scopes (7e890bf) and adding one missing Stage::Late in Finalize the scope splitting refactoring just worked.
(One more ICE was revealed by the refactoring, but not caused by it, fixed up in the last commit.)

This is a part of implementation for the Open API proposal.

rustbot · 2025-12-05T15:08:11Z

r? @davidtwco

rustbot has assigned @davidtwco.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

petrochenkov · 2025-12-05T15:10:29Z

There may be minor breakage in corner cases due to ambiguity checking being unified between in-scope resolution and in-module resolution, so this needs a crater run.
@bors try

resolve: Split `Scope::Module` into two scopes for non-glob and glob bindings

petrochenkov · 2025-12-05T15:19:30Z

compiler/rustc_resolve/src/imports.rs

-                            && glob_binding.res() != non_glob_binding.res()
-                        {
-                            resolution.non_glob_binding = Some(this.new_ambiguity_binding(
-                                AmbiguityKind::GlobVsExpanded,


@yaahc you may be interested, this PR removes one of the "gray areas".

petrochenkov · 2025-12-06T15:08:56Z

@bors try

resolve: Split `Scope::Module` into two scopes for non-glob and glob bindings

rust-bors · 2025-12-06T17:25:26Z

☀️ Try build successful (CI)
Build commit: 0c70cfb (0c70cfbec949d241375e31c5a42066be70c720fc, parent: da2544bfbe84df7b24d83c029c74299ebf6112c6)

petrochenkov · 2025-12-06T20:58:57Z

@craterbot check

craterbot · 2025-12-06T20:59:13Z

👌 Experiment pr-149681 created and queued.
🤖 Automatically detected try build 0c70cfb
🔍 You can check out the queue and this experiment's details.

ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

davidtwco

LGTM, I'm not incredibly familiar with name resolution, so you might want another review, but if this is mostly mechanical then it's up to you

View changes since this review

bors · 2025-12-13T11:32:59Z

☔ The latest upstream changes (presumably #149941) made this pull request unmergeable. Please resolve the merge conflicts.

craterbot · 2025-12-19T10:10:17Z

🚧 Experiment pr-149681 is now running

ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

craterbot · 2025-12-21T01:19:01Z

🎉 Experiment pr-149681 is completed!
📊 58 regressed and 5 fixed (753932 total)
📊 2039 spurious results on the retry-regressed-list.txt, consider a retry¹ if this is a significant amount.
📰 Open the summary report.

⚠️ If you notice any spurious failure please add them to the denylist!
ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

re-run the experiment with crates=https://crater-reports.s3.amazonaws.com/pr-149681/retry-regressed-list.txt ↩

…d the innermost binding. Previously we could lose the already found binding and break with an error, if some blocking error was found in the shadowed scopes. Also, avoid some impossible state in the return type of `fn resolve_ident_in_scope`.

…bindings

in the same module to the usual ambiguity infra in `resolve_ident_in_scope_set`

for looking up a name in two scopes insice a module - non-glob and glob bindings.

…ings in the same module to the usual ambiguity infra in `resolve_ident_in_scope_set`

…ious commit

petrochenkov · 2025-12-21T16:20:36Z

The remaining 4 root regressions are similar to #145575 that happened because of the similar prelude scope split, and can be mitigated with a similar hack.
I'll implement it during the week.

collinfounier346523-oss · 2025-12-21T16:26:17Z

thanks for confirming how this works

…

On Sun, Dec 21, 2025 at 4:22 PM Vadim Petrochenkov ***@***.***> wrote: *petrochenkov* left a comment (rust-lang/rust#149681) <#149681 (comment)> The remaining 4 root regressions are similar to #145575 <#145575> that happened because of the similar prelude scope split, and can be mitigated with a similar hack. I'll implement it during the week. — Reply to this email directly, view it on GitHub <#149681 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/B3ZT2CQJ7TWY4HZMS62TS2T4C3CLTAVCNFSM6AAAAACOFGWFOWVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZTMNZZGA2TSNZQGM> . You are receiving this because you are subscribed to this thread.Message ID: ***@***.***>

rustbot · 2025-12-21T16:42:42Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

rustbot assigned davidtwco Dec 5, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 5, 2025

petrochenkov mentioned this pull request Dec 5, 2025

Introduce Scope::NonGlobModule and Scope::GlobModule #144131

Closed

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Dec 5, 2025

Auto merge of #149681 - petrochenkov:openapi1, r=<try>

588eab2

resolve: Split `Scope::Module` into two scopes for non-glob and glob bindings

petrochenkov added S-waiting-on-crater Status: Waiting on a crater run to be completed. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 5, 2025

petrochenkov commented Dec 5, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

This comment was marked as resolved.

Sign in to view

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-crater Status: Waiting on a crater run to be completed. labels Dec 6, 2025

petrochenkov mentioned this pull request Dec 6, 2025

resolve: Preserve ambiguous glob reexports in crate metadata #147984

Merged

petrochenkov force-pushed the openapi1 branch from fdaf022 to 1b2b0da Compare December 6, 2025 15:07

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Dec 6, 2025

Auto merge of #149681 - petrochenkov:openapi1, r=<try>

0c70cfb

resolve: Split `Scope::Module` into two scopes for non-glob and glob bindings

This comment has been minimized.

Sign in to view

petrochenkov added S-waiting-on-crater Status: Waiting on a crater run to be completed. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 6, 2025

davidtwco approved these changes Dec 9, 2025

View reviewed changes

yaahc added the A-resolve Area: Name/path resolution done by `rustc_resolve` specifically label Dec 9, 2025

craterbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-crater Status: Waiting on a crater run to be completed. labels Dec 21, 2025

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 21, 2025

petrochenkov added 7 commits December 21, 2025 18:20

resolve: Split Scope::Module into two scopes for non-glob and glob …

bb98a2b

…bindings

resolve: Migrate a special ambiguity for glob vs non-glob bindings

7cf3fda

in the same module to the usual ambiguity infra in `resolve_ident_in_scope_set`

resolve: Introduce ScopeSet::Module

db3f7a4

for looking up a name in two scopes insice a module - non-glob and glob bindings.

resolve: Migrate one more special ambiguity for glob vs non-glob bind…

7e21927

…ings in the same module to the usual ambiguity infra in `resolve_ident_in_scope_set`

resolve: Patch up an inconsistent resolution ICE revealed by the prev…

2722cbf

…ious commit

Match the old logic closer

d0d5483

petrochenkov force-pushed the openapi1 branch from 1b2b0da to d0d5483 Compare December 21, 2025 16:42

Uh oh!

resolve: Split Scope::Module into two scopes for non-glob and glob bindings #149681

Are you sure you want to change the base?

resolve: Split Scope::Module into two scopes for non-glob and glob bindings #149681

Conversation

petrochenkov commented Dec 5, 2025

Uh oh!

rustbot commented Dec 5, 2025

Uh oh!

petrochenkov commented Dec 5, 2025

Uh oh!

This comment has been minimized.

petrochenkov Dec 5, 2025

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment was marked as resolved.

This comment has been minimized.

petrochenkov commented Dec 6, 2025

Uh oh!

This comment has been minimized.

rust-bors bot commented Dec 6, 2025

Uh oh!

petrochenkov commented Dec 6, 2025

Uh oh!

craterbot commented Dec 6, 2025

Uh oh!

davidtwco left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bors commented Dec 13, 2025

Uh oh!

craterbot commented Dec 19, 2025

Uh oh!

craterbot commented Dec 21, 2025

Footnotes

Uh oh!

petrochenkov commented Dec 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

collinfounier346523-oss commented Dec 21, 2025 via email

Uh oh!

rustbot commented Dec 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

resolve: Split `Scope::Module` into two scopes for non-glob and glob bindings #149681

resolve: Split `Scope::Module` into two scopes for non-glob and glob bindings #149681

davidtwco left a comment •

edited by rustbot

Loading

petrochenkov commented Dec 21, 2025 •

edited

Loading